From 56a58655feeb6b700d243f98bc272cf967e38cf9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sun, 22 Jan 2017 14:37:56 +0100 Subject: [PATCH] Remove unnecessary gtk_widget_show calls --- gtk/gtkactionbar.c | 2 -- gtk/gtkcolorbutton.c | 1 - gtk/gtkcombobox.c | 2 -- gtk/gtkentrycompletion.c | 1 - gtk/gtkheaderbar.c | 6 ----- gtk/gtklistbox.c | 1 - gtk/gtkmenubutton.c | 1 - gtk/gtkmenuitem.c | 1 - gtk/gtkmenusectionbox.c | 10 -------- gtk/gtkmodelbutton.c | 1 - gtk/gtkplacesview.c | 6 ----- gtk/gtkpopover.c | 1 - gtk/gtkscrolledwindow.c | 3 --- gtk/gtkshortcutlabel.c | 3 --- gtk/gtkshortcutssection.c | 3 --- gtk/gtkshortcutswindow.c | 4 --- gtk/gtktoolbar.c | 2 -- gtk/gtktoolbutton.c | 4 --- gtk/gtktreemenu.c | 4 --- gtk/gtktreeviewcolumn.c | 5 ---- gtk/gtkwidget.c | 4 +++ gtk/ui/gtkcoloreditor.ui | 18 -------------- gtk/ui/gtkcombobox.ui | 4 --- gtk/ui/gtkdialog.ui | 4 --- gtk/ui/gtkfilechooserwidget.ui | 2 -- gtk/ui/gtklockbutton.ui | 5 ---- gtk/ui/gtkpathbar.ui | 4 --- gtk/ui/gtkplacesview.ui | 45 ---------------------------------- gtk/ui/gtkscalebutton.ui | 5 ---- gtk/ui/gtksearchbar.ui | 6 ----- gtk/ui/gtksidebarrow.ui | 7 ------ gtk/ui/gtkstatusbar.ui | 3 --- gtk/ui/gtkvolumebutton.ui | 1 - 33 files changed, 4 insertions(+), 165 deletions(-) diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c index e87a0c3c9a..db76a66aca 100644 --- a/gtk/gtkactionbar.c +++ b/gtk/gtkactionbar.c @@ -353,11 +353,9 @@ gtk_action_bar_init (GtkActionBar *action_bar) priv->revealer = gtk_revealer_new (); gtk_widget_set_parent (priv->revealer, widget); - gtk_widget_show (priv->revealer); priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (priv->revealer), priv->box); - gtk_widget_show (priv->box); gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), TRUE); gtk_revealer_set_transition_type (GTK_REVEALER (priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP); diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 8bab7e0dff..691ae7ac01 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -355,7 +355,6 @@ gtk_color_button_init (GtkColorButton *button) gtk_widget_set_size_request (priv->swatch, rect.width, rect.height); gtk_container_add (GTK_CONTAINER (button), priv->swatch); - gtk_widget_show (priv->swatch); button->priv->title = g_strdup (_("Pick a Color")); /* default title */ diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 71fbe13a02..8b67b39b2a 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1268,7 +1268,6 @@ gtk_combo_box_create_child (GtkComboBox *combo_box) GtkStyleContext *context; entry = gtk_entry_new (); - gtk_widget_show (entry); gtk_container_add (GTK_CONTAINER (combo_box), entry); context = gtk_widget_get_style_context (GTK_WIDGET (entry)); @@ -1287,7 +1286,6 @@ gtk_combo_box_create_child (GtkComboBox *combo_box) gtk_container_add (GTK_CONTAINER (gtk_widget_get_parent (priv->arrow)), priv->cell_view); _gtk_bin_set_child (GTK_BIN (combo_box), priv->cell_view); - gtk_widget_show (priv->cell_view); } } diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index ed6837dc83..b5404d52b7 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -623,7 +623,6 @@ gtk_entry_completion_constructed (GObject *object) popup_frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (popup_frame), GTK_SHADOW_ETCHED_IN); - gtk_widget_show (popup_frame); gtk_container_add (GTK_CONTAINER (priv->popup_window), popup_frame); priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c index 83d890f4dd..3ca1894565 100644 --- a/gtk/gtkheaderbar.c +++ b/gtk/gtkheaderbar.c @@ -135,11 +135,9 @@ init_sizing_box (GtkHeaderBar *bar) * in case we have only the title. */ w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_show (w); priv->label_sizing_box = g_object_ref_sink (w); w = gtk_label_new (NULL); - gtk_widget_show (w); context = gtk_widget_get_style_context (w); gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLE); gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE); @@ -172,7 +170,6 @@ create_title_box (const char *title, label_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_valign (label_box, GTK_ALIGN_CENTER); - gtk_widget_show (label_box); title_label = gtk_label_new (title); context = gtk_widget_get_style_context (title_label); @@ -181,7 +178,6 @@ create_title_box (const char *title, gtk_label_set_single_line_mode (GTK_LABEL (title_label), TRUE); gtk_label_set_ellipsize (GTK_LABEL (title_label), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (label_box), title_label, FALSE, FALSE); - gtk_widget_show (title_label); gtk_label_set_width_chars (GTK_LABEL (title_label), MIN_TITLE_CHARS); subtitle_label = gtk_label_new (subtitle); @@ -357,7 +353,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) priv->titlebar_icon = button; gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton"); gtk_widget_set_size_request (button, 20, 20); - gtk_widget_show (button); if (!_gtk_header_bar_update_window_icon (bar, window)) { gtk_widget_destroy (button); @@ -479,7 +474,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) NULL); } - gtk_widget_show (box); gtk_widget_set_parent (box, GTK_WIDGET (bar)); if (i == 0) diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index 05832b0d2b..ce7accb34e 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -2899,7 +2899,6 @@ gtk_list_box_insert (GtkListBox *box, else { row = GTK_LIST_BOX_ROW (gtk_list_box_row_new ()); - gtk_widget_show (GTK_WIDGET (row)); gtk_container_add (GTK_CONTAINER (row), child); } diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c index ddb17895d1..43e18a396e 100644 --- a/gtk/gtkmenubutton.c +++ b/gtk/gtkmenubutton.c @@ -604,7 +604,6 @@ add_arrow (GtkMenuButton *menu_button) arrow = gtk_image_new (); set_arrow_type (GTK_IMAGE (arrow), menu_button->priv->arrow_type); gtk_container_add (GTK_CONTAINER (menu_button), arrow); - gtk_widget_show (arrow); menu_button->priv->arrow_widget = arrow; } diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index d2ae63a799..16a6e16b71 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1963,7 +1963,6 @@ gtk_menu_item_ensure_label (GtkMenuItem *menu_item) gtk_container_add (GTK_CONTAINER (menu_item), accel_label); gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), GTK_WIDGET (menu_item)); - gtk_widget_show (accel_label); } } diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index b5608e94c3..4d863673d7 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -323,8 +323,6 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item, g_signal_connect (widget, "clicked", G_CALLBACK (gtk_popover_item_activate), item); } - gtk_widget_show (widget); - g_object_set_data_full (G_OBJECT (widget), "GtkMenuTrackerItem", g_object_ref (item), g_object_unref); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); @@ -350,7 +348,6 @@ gtk_menu_section_box_init (GtkMenuSectionBox *box) box->item_box = GTK_BOX (item_box); gtk_box_pack_end (GTK_BOX (box), item_box, FALSE, FALSE); gtk_widget_set_halign (GTK_WIDGET (item_box), GTK_ALIGN_FILL); - gtk_widget_show (item_box); gtk_widget_set_halign (GTK_WIDGET (box), GTK_ALIGN_FILL); g_object_set (box, "margin", 0, NULL); @@ -432,9 +429,6 @@ gtk_menu_section_box_new_toplevel (GtkStack *stack, gtk_menu_section_box_remove_func, box); g_signal_connect (G_OBJECT (popover), "notify::position", G_CALLBACK (update_popover_position_cb), box); - - - gtk_widget_show (GTK_WIDGET (box)); } static void @@ -461,14 +455,12 @@ gtk_menu_section_box_new_submenu (GtkMenuTrackerItem *item, g_object_set_data (G_OBJECT (focus), "focus", button); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); - gtk_widget_show (button); g_signal_connect (focus, "clicked", G_CALLBACK (open_submenu), item); g_signal_connect (button, "clicked", G_CALLBACK (close_submenu), item); gtk_stack_add_named (GTK_STACK (gtk_widget_get_ancestor (GTK_WIDGET (toplevel), GTK_TYPE_STACK)), GTK_WIDGET (box), gtk_menu_tracker_item_get_label (item)); - gtk_widget_show (GTK_WIDGET (box)); box->tracker = gtk_menu_tracker_new_for_item_link (item, G_MENU_LINK_SUBMENU, FALSE, FALSE, gtk_menu_section_box_insert_func, @@ -538,8 +530,6 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, { box->separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); g_object_ref_sink (box->separator); - - gtk_widget_show (box->separator); } box->tracker = gtk_menu_tracker_new_for_item_link (item, G_MENU_LINK_SECTION, FALSE, FALSE, diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index 8109079f47..baa568af73 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -1141,7 +1141,6 @@ gtk_model_button_init (GtkModelButton *button) gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); button->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_set_halign (button->box, GTK_ALIGN_FILL); - gtk_widget_show (button->box); button->image = gtk_image_new (); gtk_widget_hide (button->image); button->label = gtk_label_new (""); diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c index fe2aade66a..8edeab0d1b 100644 --- a/gtk/gtkplacesview.c +++ b/gtk/gtkplacesview.c @@ -1642,7 +1642,6 @@ build_popup_menu (GtkPlacesView *view, "activate", G_CALLBACK (open_cb), row); - gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), item); if (priv->open_flags & GTK_PLACES_OPEN_NEW_TAB) @@ -1652,7 +1651,6 @@ build_popup_menu (GtkPlacesView *view, "activate", G_CALLBACK (open_in_new_tab_cb), row); - gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), item); } @@ -1663,7 +1661,6 @@ build_popup_menu (GtkPlacesView *view, "activate", G_CALLBACK (open_in_new_window_cb), row); - gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), item); } @@ -1676,7 +1673,6 @@ build_popup_menu (GtkPlacesView *view, /* Separator */ item = gtk_separator_menu_item_new (); - gtk_widget_show (item); gtk_menu_shell_insert (GTK_MENU_SHELL (priv->popup_menu), item, -1); /* Mount/Unmount items */ @@ -1687,7 +1683,6 @@ build_popup_menu (GtkPlacesView *view, "activate", G_CALLBACK (unmount_cb), row); - gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), item); } else @@ -1697,7 +1692,6 @@ build_popup_menu (GtkPlacesView *view, "activate", G_CALLBACK (mount_cb), row); - gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), item); } } diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 4a6c753c96..7277aca0b3 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -2316,7 +2316,6 @@ gtk_popover_bind_model (GtkPopover *popover, gtk_stack_set_vhomogeneous (GTK_STACK (stack), FALSE); gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT); gtk_stack_set_interpolate_size (GTK_STACK (stack), TRUE); - gtk_widget_show (stack); gtk_container_add (GTK_CONTAINER (popover), stack); gtk_menu_section_box_new_toplevel (GTK_STACK (stack), diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index b4e5c8c956..bc23a13f78 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -2144,7 +2144,6 @@ gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window, gtk_widget_set_parent (priv->hscrollbar, GTK_WIDGET (scrolled_window)); g_object_ref (priv->hscrollbar); - gtk_widget_show (priv->hscrollbar); update_scrollbar_positions (scrolled_window); } else @@ -2212,7 +2211,6 @@ gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolled_window, gtk_widget_set_parent (priv->vscrollbar, GTK_WIDGET (scrolled_window)); g_object_ref (priv->vscrollbar); - gtk_widget_show (priv->vscrollbar); update_scrollbar_positions (scrolled_window); } else @@ -3805,7 +3803,6 @@ gtk_scrolled_window_add (GtkContainer *container, else { scrollable_child = gtk_viewport_new (hadj, vadj); - gtk_widget_show (scrollable_child); gtk_container_set_focus_hadjustment (GTK_CONTAINER (scrollable_child), gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); gtk_container_set_focus_vadjustment (GTK_CONTAINER (scrollable_child), diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c index bfacbd391e..b7003dd94d 100644 --- a/gtk/gtkshortcutlabel.c +++ b/gtk/gtkshortcutlabel.c @@ -257,7 +257,6 @@ dim_label (const gchar *text) GtkWidget *label; label = gtk_label_new (text); - gtk_widget_show (label); gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); return label; @@ -287,7 +286,6 @@ display_shortcut (GtkContainer *self, gtk_style_context_add_class (gtk_widget_get_style_context (disp), "keycap"); gtk_label_set_use_markup (GTK_LABEL (disp), TRUE); - gtk_widget_show (disp); gtk_container_add (self, disp); } g_strfreev (keys); @@ -380,7 +378,6 @@ gtk_shortcut_label_rebuild (GtkShortcutLabel *self) GtkWidget *label; label = dim_label (self->disabled_text); - gtk_widget_show (label); gtk_container_add (GTK_CONTAINER (self), label); return; diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c index b8bef99ca1..ac2abc15f0 100644 --- a/gtk/gtkshortcutssection.c +++ b/gtk/gtkshortcutssection.c @@ -648,7 +648,6 @@ gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self) GtkSizeGroup *size_group; column_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 22); - gtk_widget_show (column_box); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); g_object_set_data_full (G_OBJECT (column_box), "accel-size-group", size_group, g_object_unref); @@ -660,7 +659,6 @@ gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self) GtkWidget *page; page = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 22); - gtk_widget_show (page); pages = g_list_append (pages, page); current_page = page; @@ -694,7 +692,6 @@ gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self) guint n; column_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 22); - gtk_widget_show (column_box); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); g_object_set_data_full (G_OBJECT (column_box), "accel-size-group", size_group, g_object_unref); diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c index 952b01d9a0..6ef901f75b 100644 --- a/gtk/gtkshortcutswindow.c +++ b/gtk/gtkshortcutswindow.c @@ -917,12 +917,10 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) gtk_header_bar_set_custom_title (priv->header_bar, GTK_WIDGET (priv->title_stack)); label = gtk_label_new (_("Shortcuts")); - gtk_widget_show (label); gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_TITLE); gtk_stack_add_named (priv->title_stack, label, "title"); label = gtk_label_new (_("Search Results")); - gtk_widget_show (label); gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_TITLE); gtk_stack_add_named (priv->title_stack, label, "search"); @@ -945,7 +943,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (arrow); gtk_container_add (GTK_CONTAINER (menu_box), GTK_WIDGET (arrow)); priv->popover = g_object_new (GTK_TYPE_POPOVER, @@ -965,7 +962,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) gtk_container_add (GTK_CONTAINER (priv->popover), GTK_WIDGET (priv->list_box)); priv->search_entry = GTK_SEARCH_ENTRY (gtk_search_entry_new ()); - gtk_widget_show (GTK_WIDGET (priv->search_entry)); gtk_container_add (GTK_CONTAINER (priv->search_bar), GTK_WIDGET (priv->search_entry)); g_object_set (priv->search_entry, "placeholder-text", _("Search Shortcuts"), diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 8e8d9e0c0d..2eb4e08fda 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -663,7 +663,6 @@ gtk_toolbar_init (GtkToolbar *toolbar) priv->arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON); gtk_widget_set_name (priv->arrow, "gtk-toolbar-arrow"); - gtk_widget_show (priv->arrow); gtk_container_add (GTK_CONTAINER (priv->arrow_button), priv->arrow); gtk_widget_set_parent (priv->arrow_button, widget); @@ -2242,7 +2241,6 @@ gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar, content = toolbar_content_new_tool_item (toolbar, GTK_TOOL_ITEM (placeholder), TRUE, index_); - gtk_widget_show (placeholder); } g_assert (content); diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 594d6af911..c8f8e4366f 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -299,7 +299,6 @@ gtk_tool_button_init (GtkToolButton *button, G_CALLBACK (button_clicked), button, 0); gtk_container_add (GTK_CONTAINER (button), button->priv->button); - gtk_widget_show (button->priv->button); } static void @@ -412,8 +411,6 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) label = gtk_label_new (label_text); g_free (label_text); - - gtk_widget_show (label); } if (GTK_IS_LABEL (label)) @@ -471,7 +468,6 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) else if (button->priv->icon_name) { icon = gtk_image_new_from_icon_name (button->priv->icon_name, icon_size); - gtk_widget_show (icon); } if (icon) diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c index c4ccfb8ad2..afc90bdf4c 100644 --- a/gtk/gtktreemenu.c +++ b/gtk/gtktreemenu.c @@ -1220,7 +1220,6 @@ gtk_tree_menu_create_item (GtkTreeMenu *menu, if (is_separator) { item = gtk_separator_menu_item_new (); - gtk_widget_show (item); g_object_set_qdata_full (G_OBJECT (item), tree_menu_path_quark, @@ -1231,13 +1230,10 @@ gtk_tree_menu_create_item (GtkTreeMenu *menu, { view = gtk_cell_view_new_with_context (priv->area, priv->context); item = gtk_menu_item_new (); - gtk_widget_show (view); - gtk_widget_show (item); gtk_cell_view_set_model (GTK_CELL_VIEW (view), priv->model); gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (view), path); - gtk_widget_show (view); gtk_container_add (GTK_CONTAINER (item), view); g_signal_connect (item, "activate", G_CALLBACK (item_activated_cb), menu); diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 9b72d2d653..9052ed3704 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -820,7 +820,6 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) priv->button = gtk_button_new (); g_object_ref_sink (priv->button); - gtk_widget_show (priv->button); gtk_widget_add_events (priv->button, GDK_POINTER_MOTION_MASK); g_signal_connect (priv->button, "event", @@ -842,7 +841,6 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) else { child = gtk_label_new (priv->title); - gtk_widget_show (child); } g_signal_connect (child, "mnemonic-activate", @@ -862,9 +860,6 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) gtk_container_add (GTK_CONTAINER (priv->frame), child); gtk_container_add (GTK_CONTAINER (priv->button), hbox); - - gtk_widget_show (hbox); - gtk_widget_show (priv->frame); } static void diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index eb234bc17e..e6c44af52d 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4226,6 +4226,10 @@ gtk_widget_show (GtkWidget *widget) gtk_widget_pop_verify_invariants (widget); g_object_unref (widget); } + else + { + g_warning ("%s is already visible", gtk_widget_get_name (widget)); + } } static void diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui index fbef1e7cbb..aa2f03a871 100644 --- a/gtk/ui/gtkcoloreditor.ui +++ b/gtk/ui/gtkcoloreditor.ui @@ -31,18 +31,15 @@ - 1 - 1 30 30 12 12 - True editor-color-sample False rgb(255,255,255) @@ -56,7 +53,6 @@ - 1 1 @@ -74,7 +70,6 @@ - True True vertical h_adj @@ -89,7 +84,6 @@ - True True a_adj False @@ -110,7 +104,6 @@ 300 300 - True True h_adj s_adj @@ -141,7 +134,6 @@ - 1 12 12 12 @@ -149,7 +141,6 @@ 6 - 1 A @@ -159,7 +150,6 @@ - 1 1 2 2 @@ -187,7 +177,6 @@ - 1 12 12 12 @@ -195,7 +184,6 @@ 6 - 1 H @@ -205,7 +193,6 @@ - 1 1 2 2 @@ -233,7 +220,6 @@ - 1 12 12 12 @@ -242,7 +228,6 @@ 6 - 1 S @@ -252,7 +237,6 @@ - 1 V @@ -262,7 +246,6 @@ - 1 1 2 2 @@ -281,7 +264,6 @@ - 1 1 2 2 diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui index 0a8ac8ba98..a3126c8de6 100644 --- a/gtk/ui/gtkcombobox.ui +++ b/gtk/ui/gtkcombobox.ui @@ -4,20 +4,16 @@